Merge "Fix --pagelist for dumpBackup.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 Jan 2016 03:30:34 +0000 (03:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Jan 2016 03:30:34 +0000 (03:30 +0000)
maintenance/dumpBackup.php

index 6b5792a..18737a4 100644 (file)
@@ -95,13 +95,10 @@ TEXT;
                $this->reporting = !$this->hasOption( 'quiet' );
 
                if ( $this->hasOption( 'pagelist' ) ) {
-                       $olddir = getcwd();
-                       chdir( $originalDir );
-                       $pages = file( $this->getOption( 'quiet' ) );
-                       chdir( $olddir );
+                       $filename = $this->getOption( 'pagelist' );
+                       $pages = file( $filename );
                        if ( $pages === false ) {
-                               echo "Unable to open file {$options['pagelist']}\n";
-                               die( 1 );
+                               $this->fatalError( "Unable to open file {$filename}\n" );
                        }
                        $pages = array_map( 'trim', $pages );
                        $this->pages = array_filter( $pages, create_function( '$x', 'return $x !== "";' ) );